Fix zlib, warning tweaks.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4677 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/gbfile.cc b/gpsbabel/gbfile.cc
index e24531e0ee8a0a3b4064e05efb399351b6c718f0..d417e15e109cb95c1ffefe74cb91f453f02fe52a 100644 (file)
--- a/gpsbabel/gbfile.cc
+++ b/gpsbabel/gbfile.cc
@@ -21,6 +21,7 @@
  */
 
 #include "defs.h"
+#include "zconf.h"
 #include "gbfile.h"
 
 #include <assert.h>
@@ -85,9 +86,9 @@ gzapi_open(gbfile* self, const char* mode)
       fd = stdout;
     }
     SET_BINARY_MODE(fd);
-    self->handle.gz = (void**)gzdopen(fileno(fd), openmode);
+    self->handle.gz = gzdopen(fileno(fd), openmode);
   } else {
-    self->handle.gz = (void**)gzopen(self->name, openmode);
+    self->handle.gz = gzopen(self->name, openmode);
   }
 
   if (self->handle.gz == NULL) {

diff --git a/gpsbabel/gbfile.h b/gpsbabel/gbfile.h
index 15ff911b47c8f558415698b0128679288e435a00..217de1ef0f52016058cbfc22a6c8b19dba90fce3 100644 (file)
--- a/gpsbabel/gbfile.h
+++ b/gpsbabel/gbfile.h
@@ -55,7 +55,7 @@ typedef struct gbfile_s {
     FILE* std;
     unsigned char* mem;
 #if !ZLIB_INHIBITED
-    gzFile* gz;
+    gzFile gz;
 #endif
   } handle;
   char*   name;

diff --git a/gpsbabel/nmn4.cc b/gpsbabel/nmn4.cc
index 4e039fac155b1a161c9d0b140ac2aa5c610c829f..ff70b316b984e0a9f6b6d04c59f06b633df30314 100644 (file)
--- a/gpsbabel/nmn4.cc
+++ b/gpsbabel/nmn4.cc
@@ -48,7 +48,8 @@ arglist_t nmn4_args[] = {
 
 
 /* helpers */
-
+#if NEW_STRINGS
+#else
 static char*
 nmn4_concat(const char* arg0, ...)
 {
@@ -77,6 +78,7 @@ nmn4_concat(const char* arg0, ...)
 
   return res;
 }
+#endif
 
 static void
 nmn4_check_line(char* line)

diff --git a/gpsbabel/vitovtt.cc b/gpsbabel/vitovtt.cc
index 786a51d136506a7be5172a3e0db30f49ca5dd8be..b87a358be14b91edef94d99f2b9cf0ee18351f79 100644 (file)
--- a/gpsbabel/vitovtt.cc
+++ b/gpsbabel/vitovtt.cc
@@ -38,8 +38,8 @@ static gbfile*                        infile  = 0;
 static int                             count   = 0;
 
 static const int                       vitovtt_version                         = 3;
-static const size_t                    vitovtt_headersize                      = 16;
-static const size_t                    vitovtt_datasize                        = 32;
+// static const size_t                 vitovtt_headersize                      = 16;
+// static const size_t                 vitovtt_datasize                        = 32;
 
 static const double                    vitovtt_latitudescale           = 20000000.0;
 static const double                    vitovtt_longitudescale          = 10000000.0;